Merge with xenppc-unstable.hg
authorkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Mon, 5 Mar 2007 11:18:55 +0000 (11:18 +0000)
committerkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Mon, 5 Mar 2007 11:18:55 +0000 (11:18 +0000)

Trivial merge